Merge branch 'master' of http://git.denx.de/u-boot-mmc
authorTom Rini <[email protected]>
Wed, 21 Sep 2016 15:48:02 +0000 (11:48 -0400)
committerTom Rini <[email protected]>
Wed, 21 Sep 2016 15:48:02 +0000 (11:48 -0400)

Trivial merge